20140416 1636 App code cleanup