add cleanup methods