Cleanup and get ready for 1.4