cleanup and v1.2