Clean up circles when removed and don't just substring when removing from circle