Remove review shortcodes, some code fixing