fixed a problem with the toolkit and removed unitify for now