Clean up of Pair classes - models