First attempt at a composite clean up