some cleanups in interpreter