Removing deprecations

drive-by cleanups.
Change Synchronized(Set|Map) to Java concurrency