remove pointer/structure related syntax
merge to new version