Closed #3344: remove the temporary codes