Removed useless condition
Fixed CS