Remove remaining `detachable` variables