cleanup for cloudops and added viewer