remove old code breaking shortcut parser