General cleanup of the project