Eliminate EtelApp class