Changed maintainer and remove vendor fields