Static references removed