Remove duplicate/unused references to avoid compiler warnings