Use puffnfresh/wartremover and refactor almost all warts