This should make the app easier to understand, i.e. remove anything that's not necessary.