Cleaned up C++ samples