Cleanup of submodules and travis