Removed unnecessary distinction between university and company