Clean up fixture mgmt