Clean up for version 0.1