As used in AndroGEt 1.7.x
Clean up