PIM-3367 : re-work base saver and remove, update channel controller