Clean Up for v0.1.6