Removed unused code I mistakenly left there
Fixed timeout issue for synchronized methods