cleanup 2.0 core