diff --git a/packages/dashboard/src/components/tasks/task-schedule.tsx b/packages/dashboard/src/components/tasks/task-schedule.tsx
index 104d43b8e..7797a5705 100644
--- a/packages/dashboard/src/components/tasks/task-schedule.tsx
+++ b/packages/dashboard/src/components/tasks/task-schedule.tsx
@@ -320,6 +320,7 @@ export const TaskSchedule = () => {
       {openCreateTaskForm && (
         <CreateTaskForm
           user={username ? username : 'unknown user'}
+          supportedTasks={resourceManager?.supportedTasks}
           patrolWaypoints={waypointNames}
           cleaningZones={cleaningZoneNames}
           pickupPoints={pickupPoints}
diff --git a/packages/react-components/lib/index.ts b/packages/react-components/lib/index.ts
index e97619ce4..c2554ae10 100644
--- a/packages/react-components/lib/index.ts
+++ b/packages/react-components/lib/index.ts
@@ -22,7 +22,6 @@ export * from './map';
 export * from './navigation-bar';
 export * from './place';
 export * from './robots';
-export * from './simple-filter';
 export * from './simple-info';
 export * from './spotlight-accordion';
 export * from './stack-navigator';
diff --git a/packages/react-components/lib/simple-filter.spec.tsx b/packages/react-components/lib/simple-filter.spec.tsx
deleted file mode 100644
index 2f29aeb35..000000000
--- a/packages/react-components/lib/simple-filter.spec.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent, { TargetElement } from '@testing-library/user-event';
-import React from 'react';
-import { SimpleFilter } from './simple-filter';
-
-it('should call onChange when input text is updated', () => {
-  const mockOnChange = jasmine.createSpy();
-  render(<SimpleFilter value={''} onChange={mockOnChange} />);
-
-  userEvent.paste(
-    screen.getByLabelText('text-input').childNodes[1].childNodes[0] as TargetElement,
-    'new text',
-  );
-
-  expect(mockOnChange).toHaveBeenCalled();
-});
diff --git a/packages/react-components/lib/simple-filter.stories.tsx b/packages/react-components/lib/simple-filter.stories.tsx
deleted file mode 100644
index f77f8da3d..000000000
--- a/packages/react-components/lib/simple-filter.stories.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Meta, Story } from '@storybook/react';
-import React from 'react';
-import { OnFilterChangeEvent, SimpleFilter } from './simple-filter';
-
-export default {
-  title: 'Simple Filter',
-  component: SimpleFilter,
-} as Meta;
-
-function SimpleFilterHandler(): JSX.Element {
-  const [filter, setFilter] = React.useState('');
-
-  const onChange = (e: React.ChangeEvent<OnFilterChangeEvent>) => {
-    setFilter(e.target.value);
-  };
-
-  return <SimpleFilter value={filter} onChange={onChange} />;
-}
-
-export const SimpleFilterStory: Story = (args) => {
-  return <SimpleFilterHandler {...args} />;
-};
diff --git a/packages/react-components/lib/simple-filter.tsx b/packages/react-components/lib/simple-filter.tsx
deleted file mode 100644
index 972741019..000000000
--- a/packages/react-components/lib/simple-filter.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import { TextField, Divider, styled } from '@mui/material';
-
-export interface OnFilterChangeEvent {
-  name?: string | undefined;
-  value: string;
-}
-
-export interface SimpleFilterProps {
-  onChange?: (e: React.ChangeEvent<OnFilterChangeEvent>) => void;
-  value: string;
-}
-
-const classes = {
-  simpleFilter: 'simple-filter-root',
-  filterBar: 'simple-filter-filterbar',
-  divider: 'simple-filter-divider',
-};
-const StyledDiv = styled('div')(({ theme }) => ({
-  [`&.${classes.simpleFilter}`]: {
-    margin: '1rem',
-    borderColor: theme.palette.success.main,
-  },
-  [`& .${classes.filterBar}`]: {
-    width: '100%',
-  },
-  [`& .${classes.divider}`]: {
-    margin: '1.5rem 0',
-  },
-}));
-
-export const SimpleFilter = (props: SimpleFilterProps): JSX.Element => {
-  const { onChange, value } = props;
-
-  return (
-    <StyledDiv className={classes.simpleFilter}>
-      <TextField
-        label="Filter"
-        value={value}
-        variant="outlined"
-        onChange={onChange}
-        className={classes.filterBar}
-        aria-label="text-input"
-        data-component="simple-filter"
-      />
-      <Divider className={classes.divider} />
-    </StyledDiv>
-  );
-};
diff --git a/packages/react-components/lib/tasks/types/utils.ts b/packages/react-components/lib/tasks/types/utils.ts
index 181a994ab..e98775f15 100644
--- a/packages/react-components/lib/tasks/types/utils.ts
+++ b/packages/react-components/lib/tasks/types/utils.ts
@@ -55,17 +55,6 @@ function rawStringFromJsonRequest(taskRequest: TaskRequest): string | undefined
   }
 }
 
-export const TaskDefinitionMap: Record<string, TaskDefinition> = {
-  [DefaultComposeCleanTaskDefinition.taskDefinitionId]: DefaultComposeCleanTaskDefinition,
-  [DefaultDeliveryPickupTaskDefinition.taskDefinitionId]: DefaultDeliveryPickupTaskDefinition,
-  [DefaultDeliverySequentialLotPickupTaskDefinition.taskDefinitionId]:
-    DefaultDeliverySequentialLotPickupTaskDefinition,
-  [DefaultDeliveryAreaPickupTaskDefinition.taskDefinitionId]:
-    DefaultDeliveryAreaPickupTaskDefinition,
-  [DefaultDeliveryTaskDefinition.taskDefinitionId]: DefaultDeliveryTaskDefinition,
-  [DefaultPatrolTaskDefinition.taskDefinitionId]: DefaultPatrolTaskDefinition,
-};
-
 export function getShortDescription(
   taskRequest: TaskRequest,
   taskDisplayName?: string,
@@ -118,8 +107,21 @@ export function getDefaultTaskDescription(
 }
 
 export function getTaskRequestCategory(taskDefinitionId: string): string | undefined {
-  if (taskDefinitionId in TaskDefinitionMap) {
-    return TaskDefinitionMap[taskDefinitionId].requestCategory;
+  switch (taskDefinitionId) {
+    case DefaultComposeCleanTaskDefinition.taskDefinitionId:
+      return DefaultComposeCleanTaskDefinition.requestCategory;
+    case DefaultDeliveryPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryPickupTaskDefinition.requestCategory;
+    case DefaultDeliverySequentialLotPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliverySequentialLotPickupTaskDefinition.requestCategory;
+    case DefaultDeliveryAreaPickupTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryAreaPickupTaskDefinition.requestCategory;
+    case DefaultDeliveryTaskDefinition.taskDefinitionId:
+      return DefaultDeliveryTaskDefinition.requestCategory;
+    case DefaultPatrolTaskDefinition.taskDefinitionId:
+      return DefaultPatrolTaskDefinition.requestCategory;
+    case DefaultCustomComposeTaskDefinition.taskDefinitionId:
+      return DefaultCustomComposeTaskDefinition.requestCategory;
   }
   return undefined;
 }