Got rid of mappings that could be inferred.  Also made database drop and recreate on model changes