Removed todo annotations.