utils: clean-up