tidied up gradle deps