Cleanup for gradle