fix removal of armory addresses