Removed useless util.c/h