Annex should be renovated or 'mothballed', says consultant