clean up old stuff, bump required version to 1.6.4 in master as a result