Update for runtime removal