Clean up commented out code that is not used anymore.