remove deprecated code

part of #843