More cleanup. Fewer errors.