removed some dum code