storyline cleanup