Removing debugs and fix the dump