cleanup Android sevice related code