cleanup

as a replacement for ignored upstream commit
anahita/commit@75a02f6fa23b4a5274d6a108d0d2c216b1e14a15