Remove legacy attributes