Move defaults sync to a more appropriate place