removed some commented out code to get to standard/full sync