fix cleanup methods more