removing wrong else if