Move at_key/delete to from role to class (where they should be)