APP-210 some code cleanup