Removed some uncommeted code that is not needed anymore.