FUL-78 - Remove comments / var_dump