Cleanup and work on migrating to Selvbetjening 8