Removed Device stuff

It really belongs in the local manifest