Removed some unused temporary testing data structures