Removal redundant code