Yeah, I think you're right. This pull request definitely still needs some cleanup.