Interface changes and code cleanup.
Removed an extraneous file
Merged.