stylish cleanups, mostly no longer used imports