use empty string instead of None
add missing federal parties
remove commented section
remove unneeded import
remove todo