Cleaning up utils