Continue viewer-interesting cleanup, remove dead code, move thigns into new places
Imported the constants move and cleanup from viewer-interesting