some code clean up
removal of deprecations
introductions of deprecations so uses of deprecations can be removed later