Eliminate run script, clean up code
Complete 37