fixture code cleanup