Further simplify the app