FIX: import errors and remove unused imports