Merge "Removed commented out code"