Cleanup of WikiService

Cleanup of WikiService