Remove useless code and preparing for ReCatch.