Attempt clustering, remove 1.3 stuff