remove useless code - exception here is ok