Merge "Comment out unused methods"