remove incomtible code