Continue simplification of app