Clean Up to version 0.1.2-alpha