Fix/remove unused imports