cleanup composite :-)