Resolved unreferenced local variable warnings