Cleanup and 1.0 beta test