Removed dependencies to deprecated code.