remove code unused any more