More work on the focus: deprecation