cleanup for linter/tests