removed uneeded shortcodes inc