More project clean up