Some cleanup for the gradle tasks.