Travis and code cleanups