C++ Features: Removed google specific magic