remove old addrace code.