removed unnesary lines