cleaned up deprecation