clean up
removed util and response.message