Cleanup. Added interface for "connectors" to implement.