StormDanger CleanUp (#964)