Cleaning up.

jira : QUES-39