remove feature related code form c++