Removed the polarity macro altogether