remove traces of #1