finilized by deleting some pointless data structs