cleanup done, updated to use primary device instead of cipc