Remove extract from shortcodes
Merge pull request #2437 from ghost1227/issue/2436

Remove extract from shortcodes