cleanup build.gradle and upgrade to 1.6