Remove unneeded None