Util and handler cleanup