0.2 - clean up