Cleanup Manifest and replace missing repos