removing TODO as this is now done