Remove @ from TODO