Remove extract from shortcodes

Fixes #2436