Fix edit field bug
Add OptionSet field
Remove unused code
Delete unused files
Change name