Clean app (32/42)

Clean app