Cleaning up some code from recent commit.