cleanups after thjs's interface got tweaked again