Removed some synchronized blocks