Put ifndef around unused method for clang
Comment out unused data members