Un-nest the building upgrade routes