remove unnecessery code