removing most of the optimizer, will be back after a change in data structs