Get rid of unused code a la #56