ARMORY-118 - Code cleanup.