diff --git a/components/core/ProfileIcons.tsx b/components/core/ProfileIcons.tsx
index 5397bea0..1e2b3751 100644
--- a/components/core/ProfileIcons.tsx
+++ b/components/core/ProfileIcons.tsx
@@ -13,7 +13,7 @@ interface ProfileIconsProps {
 }
 
 export const ProfileIcons = (props: ProfileIconsProps) => {
-  const { citizenshipStatus, roleInfos, size } = props
+  const { citizenshipStatus, size } = props
 
   const citizenshipInfo = citizenshipInfoFromStatus(citizenshipStatus)
 
@@ -29,15 +29,6 @@ export const ProfileIcons = (props: ProfileIconsProps) => {
           />
         </Tooltip>
       )}
-      {roleInfos.map((roleInfo) => (
-        <Tooltip key={roleInfo.name} tooltip={roleInfo.name}>
-          <Icon
-            name={roleInfo.iconName}
-            color="yellow600"
-            size={size ?? ICON_SIZE}
-          />
-        </Tooltip>
-      ))}
     </Container>
   )
 }
diff --git a/components/profile/EditProfileForm.tsx b/components/profile/EditProfileForm.tsx
index 818b871e..ecb8cdec 100644
--- a/components/profile/EditProfileForm.tsx
+++ b/components/profile/EditProfileForm.tsx
@@ -11,7 +11,6 @@ import { HorizontalDivider } from '@/components/core/Divider'
 import { AboutInput } from '@/components/profile/AboutInput'
 import { ContactInput } from '@/components/profile/ContactInput'
 import { Identity } from './edit-profile/Identity'
-import { Roles } from './edit-profile/Roles'
 
 export interface UpdateProfileProps {
   user: MeFragment
@@ -23,7 +22,6 @@ export const EditProfileForm = ({
   user,
   profileEditParams,
   onChange,
-  onRolesChange,
 }: {
   user: MeFragment
   profileEditParams: ProfileEditParams['data'] | null
@@ -48,8 +46,6 @@ export const EditProfileForm = ({
         onChange={onChange}
       />
       <HorizontalDivider />
-      <Roles user={user} onChange={onRolesChange} />
-      <HorizontalDivider />
       <Contact
         user={user}
         profileEditParams={profileEditParams}
diff --git a/components/profile/setup-profile/step-configuration.ts b/components/profile/setup-profile/step-configuration.ts
index c295b50c..3695c523 100644
--- a/components/profile/setup-profile/step-configuration.ts
+++ b/components/profile/setup-profile/step-configuration.ts
@@ -1,7 +1,6 @@
 import { ContactFieldType } from '@/utils/types/profile'
 import { AboutStep } from './AboutStep'
 import { ContactStep } from './ContactStep'
-import { RoleStep } from './RoleStep'
 
 export type StepConfig = {
   name: string
@@ -19,10 +18,6 @@ export const steps: StepConfig[] = [
     name: 'About',
     component: AboutStep,
   },
-  {
-    name: 'Roles',
-    component: RoleStep,
-  },
   {
     name: 'Contact',
     component: ContactStep,
diff --git a/components/profile/view-profile/ProfileContent.tsx b/components/profile/view-profile/ProfileContent.tsx
index aab92a64..2c5dcb17 100644
--- a/components/profile/view-profile/ProfileContent.tsx
+++ b/components/profile/view-profile/ProfileContent.tsx
@@ -3,7 +3,6 @@ import { ProfileSetupSection } from './ProfileSetupSection'
 import { ProfileInnerContainer } from '../profile.styles'
 import { ProfileAboutSection } from './ProfileAboutSection'
 import { ProfileHeaderSection } from './ProfileHeaderSection'
-import { ProfileRolesSection } from './ProfileRolesSection'
 import { ProfilePassportsSection } from './ProfilePassportsSection'
 import { ProfileActivitiesSection } from './ProfileActivitiesSection'
 import { ProfileCitizenSection } from './ProfileCitizenSection'
@@ -31,7 +30,6 @@ export const ProfileContent = ({
       )}
       <ProfileAboutSection profile={profile} />
       <ProfileCitizenSection isOwnProfile={isOwnProfile} profile={profile} />
-      <ProfileRolesSection profile={profile} />
       <ProfilePassportsSection profile={profile} />
       <ProfileActivitiesSection profile={profile} />
     </ProfileInnerContainer>
diff --git a/components/profile/view-profile/ProfileSetupSection.tsx b/components/profile/view-profile/ProfileSetupSection.tsx
index a58f8f22..ec6962d3 100644
--- a/components/profile/view-profile/ProfileSetupSection.tsx
+++ b/components/profile/view-profile/ProfileSetupSection.tsx
@@ -9,6 +9,7 @@ import { Button } from '@/components/core/Button'
 import events from '@/lib/googleAnalytics/events'
 import { MeFragment, ProfileSetupStateParams } from '@/utils/types/profile'
 import { useBackend } from '@/components/hooks/useBackend'
+import { useState } from 'react'
 
 interface ProfileSetupSectionProps {
   profileId: string
@@ -24,13 +25,16 @@ export const ProfileSetupSection = ({
   const { post } = useBackend()
   const progress = complete ? 100 : 25
 
-  if (!me || me.isProfileSetupDismissed) return null
+  const [hideLinkContainer, setHideLinkContainer] = useState(false)
+
+  if (!me || me.isProfileSetupDismissed || hideLinkContainer) return null
 
   const handleSetupClick = () => {
     router.push(`/profile/${profileId}/setup`)
   }
 
   const handleDismissClick = () => {
+    setHideLinkContainer(true)
     post('PROFILE_SETUP_STATE', {
       state: 'dismissed',
     } as ProfileSetupStateParams)