Code cleanup before 1.0.0RC4 release!