Prepare for 2.0 release, clean some stuff up.