restrict versioning and reschedule buffer removal