Open to a "cleanup" PR?