remove code which become unused by the previous changes