Remove old code
Remove old code