Switch re-write clean up