Cleanup of errors committing last PR. Removed old license text.