Remove weird internal param logic and just merge them