Cleanup a few arguments and unused imports