Fix stale left-overs, cleanups.