removing TODO as this is the correct way to do things