Clean up refs for resolve