Removing imports that are not needed

And trying to use correct type per member attribute.