Fix issue #2
Remove unneeded stuff
Check if sync was truly successful