Remove TODO, will probably not need to do this now