Removed some commented out code which no longer applies