Just removed some stuff that was commented out anyway