Removed unused strings and fixed app_name