cleaned unused namespaces and template comments