got rid of step optimizer -- too unsafe.