Removed unnecessary checking lines