Fix introduced bug + remove unused imports

TBR