Revert "Revert "Removed comment again""

This reverts commit 676f537a00239e78b1c7b293cd5aeff94ef5b1a6.
Revert "Revert "Removed hammer @todo""

This reverts commit b9d28ca67636ea462751d88594c652d2518cbfd8.