Redistribute shortcode functionality, drop non-core-essential shortcodes