Cleanup for better CI integration