Upgrade to later revision of wysiwyg. Remove unnecessary patches.