fix metadata being left behind when buildings are picked up