Final cleanup for version 1... again