Final cleanup for version 1.