removed some unnecessarry synchronized blocks