KH-203: Handle removed code elements