Continued work on Remove Favorites feature