Fix warnings / remove unused imports