Lock thread_safe; remove diffy from Gemfile