Cleanup for v1.2