Legend deprecate removal + cleanup