Remove unnecessary definitions
Add a ranch's parameter