more cleanups (and removal of externals that execute per-frame)