APP-854 little cleanup