Clean up traces of remaining