removed some superfluous lines