Jb mr1

Device updates and clean up.