Removing hardcoded params