another cleanup and final fix for v1.2