More Nancy cleanup