removed un-needed structs