removing commented-out lines for tidiness