Remove g++ dependency