Update travis and cleanup some code