cleanup- remove useless code. set username, saferize stuff.