deprecate cleanup method