Minor unused references cleanup