cleaned up older deprecations

Signed-off-by: James R T Bossert <jrbosser@gmail.com>