Clean up trash from testing. scenario file and comments