Remove code unlikely to be necessary