#362 - solved minor bugs due to merge
#362 -  removed class CodeSyncControllerUtils