Takeover cleanups