A bit of house cleaning