The equipment stored in one of the the hangers could just as easily be stored elsewhere in the vicinity of the airfield if needs must. I'm not sure what's in the former Lowland Aero Services / Ferranti hangar these days.
One of the impediments to development at EDI was resolving the drainage arrangements. There was a proposal to re-route the Gogar Burn to the east of the airfield which was seen as a prerequisite to developing the SE pier, terminal extension and associated aprons and taxiways.
A revised drainage scheme is needed soon in order to comply with environmental regulations but the minutes of the Consultative Committee meetings haven't made much mention of this recently.