cleaned out old data structures