cleanup deprecate code