Remove old code

Clear old code