removed more stuff
some changes for flang