removed some superfulous code