removed some more extra code