Removed some unused 'None's