Remove a wee bit of cruft