Flag compat classes for removal

fixes #1757