Revert "1.6.4 version + cleanup"

This reverts commit 2acbbe3107fe5c6db3b28c1c4d496a54b60ad445.