Removed the cleanup barrier. Extract random Config generator