Remove outcommented code & fix bug with strict standards