minor cleanup and faster startup