remove usage of and and or per style guide