Remove unused static Joiner, organize imports