Removed references to unneeded name spaces