some unneeded optimizations