Clean up  remains of code from format version 1