master: removing unused imports