Move cleanup as a method of Core::App:

We missed a case of $self->cleanup, but at the same time we
realized the cleanup should just be a method of Core::App.

++ to Mickey for that.