got rid of unused class data

also cleaned up a bit of ugliness left over from cherry-pick and rebasing