Remove namespace in .cpp as well