Further cleanup

Currently Pure64 is just shy of 5K in size.