Removing some unused stuff and enforcing a bit of consistency in operators