Remove unneccesary None qualification