Merge "Remove/actualize unused imports"