Comment out unused code for now