old code clean up.