Merge "remove unnecessary cleanup in nova startup"