Remove default values from properties for now