Fix cleanup methods.