Cleanup / simplification + a try with spine-∨-adm