remove includes not needed. Match types other cleanup