add removal of URL parameters
refactor response
fail at refactor