Clean up environment setup

Use the common_bench scripts and remove duplicates.