Removing some commented out code