getting up to date across comps

misc
deletions

deletions