Feature/335 remove deprecated code

This resolves #335.

Removing lots of stuff is always scary.  @dnouri: review requested.