code clean - remove junk