code cleanup
update for move to new server