Big A cleanup: adding/deleting stray objects