cleanup
cleanup and fix regressions due to computations save optimizations
remove dead code