App.hx cleanup