cleanup, framework version upgrade