Remove manufacturer
Clean up file