Added cleanup methods.