EQ-1444 Code cleanup