utility cleanup post deprecation