cleanup
refactoring - got rid of scala SynchronizedMap