Port to CLApp2 complete; so removed the old CLApp, and renamed CLApp2 to replace it