Removed some of the commments of code that is no longer needed