Fixed: unused variables