utils: cleanup