Fix last instances of imports without aliases
Also drop some unused once, and fix minor code style issues.
This is backportable to KF5.
Also, let's do this, before !921 (merged) or any equivalent porting commit
CC @sporknife
Also drop some unused once, and fix minor code style issues.
This is backportable to KF5.
Also, let's do this, before !921 (merged) or any equivalent porting commit
CC @sporknife