cleanup in progress apply_changes on peer removal

oml/changelog.py

@@ -82,6 +82,10 @@ class Changelog(db.Model):
     def apply_changes(cls, user, changes):
         trigger = changes
         for change in changes:
+            if user.id in state.removepeer:
+                user.cleanup()
+                del state.removepeer[user.id]
+                return False
             if not cls.apply_change(user, change, trigger=False):
                 logger.debug('FAIL %s', change)
                 trigger = False