Eliminate CAppLib dependency