cleanup and added test for removed loves