added core and client handlers for buffer removal