simplify
whoops-- remove these
a really shitty test