Removed @ThreadSafe from classes which are not thread-safe