Removing some unneeded commented out code