Remove dead code / other cleanups.