Interpreter cleanup for standalone run and windows build