Added support for feature cleanup