fix bugs in or operations
remove ... files