I did some cleanup in #2023