Just removing more commented out code...