Cleanup imports around Datatype (not needed)