Removed excess headers/namespaces