Cleanup for release 1.1