Cleanup

Re-added Nathan's Log message changes
Removed old files