Get rid of nonsens from optimization and analysis

Chirayu Amin