Full static disable. All as objects now