Android maps cleaned up