Removing some commented code, doesn't belong