remove deprecate code