Polish and remove debug