Nice to see this sort of cruft going away :)