remove the redundant code !