Make some cleanup