Cleanup of misplaced code

Had some device code in utils, and wasnt immed executing device