Remove thread-safe classes for the moment