Removed unneeded optimizations.