misc: cleanup