Newer play services, some code cleanup