Fixing TODO statements and unused use namespaces