tidying; disconnect activity service properly