Above two lines could be removed