Polyobj: Cleanup