Cleanup for 1.0 release! Yay!