Clean up for pull
0.3.1