Apply some cleanup