removed some unnecessery code