cleanup (#1649)