Cleanup and full update to 1.3 RC2