Delete button refactor will be in a future PR.