Add company name to assembly metadata
Remove more unused code