More clean up. Removed old stale, deprecated files.