Clean-up.

DetachableHandler is not a Handler but has a Handler now.