IOISA GPS dependence removal (forgot to remove device structure as parameter)