Clean up before 0.0.2