clean up imports and remove commented code