Separated redirect to return url to separate, private function
Removed temporary trace calls