I again request that you do "cleanup" in a separate PR so it doesn't lose focus and get cluttered.