Cleaned up gradle build