remove internal copies, now in submodule