cleanup 1.9.3