Remove some procedures after optimization