code cleanup after moving into appCode