cleanup and v2.2.2