Removed some commented out lines