Fixing namespace ordering and removing redundant file.