Remove the TODO tags since they aren't relevant after testing