Polishing: remove redundant code