plane constraint (simple)
improve model structure
remove legacy strings