Cleanup on text, objects & slave units