Simplification of Classification and Hint API (and a little extra cleanup)

This is no more an operation, therefore it cannot be used in the perform.