#83 tidy imports
removed some commented out versions