Cleanup for release of v1.3