Fixed type-mappings, Added clean for wsimport