Fix
Remove old code