Namespace clean up

- Removed and sorted namespace usings.