began removing redundant functions and data structures