Code cleanup. Now we are ready for the new SmartFile sync api.