Sync; removed testing stuff, now that bug was filed