Deletions of previos #if 0's and cleanup of plan4.