WCP-80 : Cleanup.