Clean up some mess in app