cleanup for DEPRECATION WARNING