cleanup some commented out code