minor cleanup, faster travis builds