more checks
remove unused structure fields