Remove useless leftovers