Big cleanup. Nearly complete.