Remove extract from shortcodes

For #2436