cleaning old code

when known, replace with more modern uses