Moved Helpers into DataStructures with deprecation notices