Got rid of some unused and deprecated code.