bit of house cleaning, to be cont.