organize imports isn't ready for prime time
tidy up
don't import a class if it is in commented out code