Final cleanup in moved out util files.