some slight cleanup - removed unused imports