Remove more traces of CustomWrappedStack