Clean-ups, killed the "support" object