Undoing some changes oriented to debug