Remove unnecessary name spaces