More cleanups to liveinst