Started cleanup in preparation for 1.6