Cleanup and bump to 2.0 alpha

"What the ..." is actually a good name for this. Can we please skip this?