Clean up unused files
More clean up of unused files
Fixed AROrgName in Edit view