remove not needed namespaces + CS fixes