All this code is commented. Shouldn't we remove it?