[WIP] Cleanup the project