major overhaul and cleanup