Tukui code for <50400 cleanup