agreed, I'll kill it in the next commit.