Clean and remove redunant refs