remove early exception which broke tests
remove TODO comment, actually happier with that line than I thought