Minor cleanups
Proper deprecation warning