Are these commented calls still needed here?