Removed package specific data structures