did some cleanup on previous commit.