Remove unused code.
Start adding mount connector.