ask Alex!?
and then remove dead code