Removing some commented out imports