Legend deprecate removal + cleanup 

be be :wink: