Remove reduntant code