fix synching issue
 cleanup