Clean up includes, remove namespaces definition