cut out useless state-specific code :'(