Cleanup for rel 1.2