rm old functions and rename