Removed extra namespaces and files