Cleanup items for 3.0.0