Submodule updates and code cleanup.