General cleanup throughout project.