remove comment
finish removing stupid structs