clean up and update to RC3