[CLEANUP] Added 'unused' annotations to unused variables