0.3.1 and 0.4.0-SNAPSHOT - clean up