cleanup for 1.1