Fixed synchronization
Deleted unused import and added a TODO comment