app.pt cleanup after the rebase