Remove implemented user stories
Merge branch 'master' into guile-2