switch quick scheme cleanup