Clean up and prep for 0.8.0