Delete unused classes
Annotate Mappings classes for Cmd v3 compatibility
Fix SQL error with basic remote demo