Removing cruft from 3.4