Removed commented out unused code