Removed sync library
Merged from master