Cleaned up everything for 0.7 release