Removed commented out code from DataSyncController
Removed commented out code
Merge branch 'feature/cleancode' into dev