move some cruft around