Conn 1278-Removed unused files and completed development.

Unresolved merge conflict (and several more below)