remove remnants of boost::variant