Removing some commented out code that's not needed anymore...