Removed unused namespace and change some required namespaces to use :refer