Remove unused imports and change $gc up a bit