removed unnecessary and statements