more cleanup of arm and storyline behaviors