(no slip) Made param stripping optional. Minor refactor