repo cleanup, replaced tool-errgen
further cleanup