Fix tricks for account removal

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Fix sync long timeout

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Remove usage of deprecated methods

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>