Removed shortcodes, put them into plugins