noop: remove unused imports, other minor tweaks