Check in code clean up for view device