Retire paredown so that cleanups can be versioned