Errors in model classes removed