Initially when the WYSIWYG editor development started we created a GWT-RPC service servlet. With time we added all sorts on unrelated methods to this service. Recently we started to move service methods to domain specific components which are called by a generic remote service servlet. A few methods that are wiki related have remained in the old WYSIWYG service. We should transform the old servlet into a component (WikiService). Also we should stop accessing the service statically on the client and use IOC instead. Of course, till we have support for reflexion in GWT we'll have to manually inject the component service where it is needed.