Cleanup for 1.6.x

Removing unneeded code and patches.