Cleanup and quotas support