Removed some un-needed commented code