Cleaning up deprecation