make optimizations usable
cleanup, no real change