Global reorg - removed a lot of trash