nqp: cleanup