Cleaned up and removed unneeded synchronization