more minor cleanup, removing lines