Remvoed some commented out code