Removed all traces of the old top_level_set implementation