Additional fix on #831

Just removing some commented code and an unneeded call to fetch function. Sorry!