removed unnecessary data structures