Clean up 'todoes' in doc
Remove redundant annotation