ApplicationLayer code cleanup