Further removal of unused imports