Refactor deleted_at