Upgrade class finish routine should not be called in the ajax if step 1

[danieliser]

This is causing deletion of meta before upgrade processes.

Add instead a per popup clean up method and a per batch process clean up function that is separate from the finish.

Finish should be defined as cleaning up cached data.