Cleanup some stuff

don't want all these devices
also better use vendor files for 1+1 from themuppets as they are more up to date