2018 workshop cleanup - Brian Anderson