Dependencies update + some cleanup
0.2.0