Final clean up of code for 1.0 release