CE-1018 Remove redundant file
CE-1018 Namespaces clean-up