Remove obsolete class
Fix schema specificities