removed unnesessary lines