Clean up references after dispose