Removed hammer @todo