removed legacy data structures