Cleanup more useless leftovers