short-circuit minor bug

fixed minor bug with local ors it now expands.
deleted useless lines of code

useless code is useless