More Code clean up.