Rest cleanup