Cleaning up some more.

jira: QUES-39