a bit of house cleanup