Cleanup and bump to 2.0 alpha