Remove old functions
Put the code back