Removed #include & namespace statements