removing some commented out code and vestigial imports