unnecessary code-lines deleted