Cleanup. Remove commented out code.