Get rid of superfluous synchronized, kill more deadlocks