simplify compatibility

We had a lot of cruft lying around.  Just cleaning up.