Polishing

Remove dead code