removed unnecessary checking