Remove deprecate code