remove todo - tested and I'm happy doing it this way