The fallback for None values was never used so it was just rotting and cluttering the code. Remove it!