Removed more old Max abstractions.