Cleanup in packaging: super considered super