Removing some un-needed commented code