Code cleanup
Initialize a Building_Index variable.
merged trunk/6959
Cleanup (bug 1292828)