Minor redundancy cleanup