futher interpreter clean-ups