changed users, removed comented code etc/