Wee bit of cleanup