Cleanup and allow adding of non-stories