Fixed not used vars