Add Functions to filter options
Delete unused files