Cleaning up server extension.
Removed many 'todo' notes that had outlived their usefulness.