Removed todo and named query