utils code cleanup, changing toplevel makefile