Code update
Remove old code