Remove code made unnecessary by #28