clean up awful sync duplication a little