Remove unused code commented out