Ditched a lot of unused imports