[45957/45971] General cleanup

- Removed ErrorLogging
- Removed redundant qualifiers
- Removed redundant imports