Remove GMS dependency