cleanup from all the re-org & renames in this version