cleaned up android app