Extra commented out code deleted.