Cleanup project

Doesn't work yet.