UserStory clean up