Remove outcommented code please