Reverted ALL changes related to configframework