Remove ClassAnnotator, replace it with Rio version with identical functionality