Revert "Add Hangar and Metro"

This reverts commit c0b1295aed3f10b5824282a911c4e8962e17c70c.