remove debug print and use Nones