Properly removed TODO: this time