Cleanup and remove commented out code