Removed local vars that were kicking up gradle warnings