Remove now (after #447) unused code