noad: cleanup