Fix logic bugs causing 'updateQuota' to be called following 'cleanup'
Fix logic bugs causing 'updateQuota' to be called following 'cleanup'

addrummond/nodeibexfarm,addrummond/nodeibexfarm,addrummond/nodeibexfarm