remove unused header & source specific wrapper tools
ant gui
improved generics