Remove use of removed decorator mechanism