Remove unneeded None variables