Clean up this project, still WIP.