remove deprecated code, closes #324