having a single device. Also fix few PersistentManager bugs - removal must be done with same PM, previous code was leaving one unclossed.