Remove some rudundancy  aka confusion.