Temporary remove problematic references