Remove unneeded BasicThreadFactory, Update code