More cleanups to trigger travis