remove SimilarityModel2D, fixes for diff subclassing