cleanup and support for removing favorites