removed unneeded struct-def