Cleanup Top tagging

Make cleanup of top tagging code, and enable deprecation warnings.