Fix fixture cleanup