Removing defaults as behavior is unexpected