cleanup moving stuff around, deleting extraneous refs
committing deletes
added scoping flags