cleanup + SR submodule update fixes #70