remove "or None"