more rump cleanups