some more removals and cleanups