Big shell namespace cleanup