cleanup for 1.1 alpha