To avoid AND and OR with single elements

Updated how the parser creates AND and OR objects when there is a single
element. Method clean is not needed any more?