Remove hardcoded default property values