Cleaning for the version 2.