gradle version 0.6+ + cleanup